Updated UML and DataManager interface