Added type based device matching.