Added option for device filtering