We have updated the command classes to reduce ugly code