Switched commands to another class