Add new command and minor change in code