Move command check to model