Move command out of parse method