Finished the UML like structure