Added seperate classes for the commands.