Change API to deal with producer-only clients