Updated class diagram as per comments