Updated project to comply with UML