Updated class diagram
Renamed class to avoid naming conflicts