Modify for 0.2 confluent

0.2 confluent rethought some facets.  Adapt to that reality