API re-org with OpswiseObjectHandler