## Core - Updated mappings to fix Moonbase (again)