modify command builder wrt new Service structure.