Move command creation from definitons into CLI