zwave object improvement