Updated motor and manager according to UML