Clearer class diagram