Add datatype for commands
Add datatype for statements