add Cmd and Visitor, 
Warning table not working yet