Move Map handling to TableFactory.