Added new restrict mode support