Added lookup for determining device type and categores