Unify mapping and fix persister