Refactored new command