Updated with grunt templates