Some adjustments to the usdl.servicemodel classes