Changes made as per our UML Diagram