fix persistence and mapping