Quick hack, we need devicetypeid defaulted