Move persistance state logic from mappers to dao