Add Command, and language support