Changed bucket handling.