Some minimal changes on the uml model