Updated UMLs and DB