Refactor use of pithos objects to accommodate