Added some DeviceCore parsing