Change the API of Bucketed