Replaced AutoMapper with Fpr for better performance