moved maps between classes