Added in zaw plugin