Bug fix
Split create and edit commands