updated to work with conduit >= 1.0