Added enforcements to devices