Adding JOINs to Entities