Updated with Yeoman