Adding joins and supporting config and test code for entity description