Joining Diversification and Optimization for Asset Allocation