Updated UML attributes and functions