added map methode back into entity Factory