Added map filtering, changed persistence module