Refactor to the Buckets interface
Extract Bomber interface