Introduced EFMapping factory, more rewrite