Add dictionary-based NOP support