Add base commands and grammar