More API changes to support bucket types