Removed old enumerations, added include for c++ limits header
Updated UML diagrams (txt and png)