First cut of update of Common services to new COM.