new mapper and model managers (this will break BC)