Change Command base class. Add CommandBuild