Added some command detection