Adding support for notrack option