Moved mapper contract