Moved commands to separate classes