Add code to support command map grey mask.