Added searching, renamed CommandDef to Command