Minor changes for Grunt and data annotations