Revised how the commands are defined to better support type checking 0.1.3 version