Added option to batch enable on demand restricting