Moved commands under model