Map changes for #1292