Moved defined commands to separate file