Currently class Device only includes family. We find that brand is usually more accurate in both the parsed results and in reflecting the characteristic of the agent. So it's necessary to add these two fields which are already supported in other uap libs.