UPDATE: Added Entities relationships