Fixed up boilerplate code for new command