Added grammer to CLI