core mapping changes