added three entities and naming strategy