Updated Core_Mapper