Updated to new yeoman generation