Added support for second parameter to allow command-line specification of device family