Added better handling for create command