PojoSink refactored