Just adding interfaces and extra classes as per the class diagram