Added a few features to aid testing buchets