WIP Entities class diagram changes