Extend and improve grunt task