Upgraded grunt tasks