Add CustomCommand
minor code format fix