Some updated for grunt task