added entity mapping