added related entities
renamed data objects to prevent name collision