modifying parent-child structure for common-entities module