Added more grunt functionality