Improved how joins work in the ORM