more refactoring + adding per bucket clients support