Added initial device filtering