Modify context transmission to allow odd-value maps