Changed bucket interface a bit to be more future-feature friendly