Markowitz and the Expanding Definition of Risk: Applications of Multi-factor Risk Models