more updates for UML CS