Initial entity mapping