LPS-43824 Rewire the entities in the DDL app