Set bucket type & begin new structure to remove duplicate code