Updated UML for OO changes