Fix relations between Entity and Size/Complexity