Updated UML diagram and removed unnessecary imports