Updated UML diagram
Updated MS