Add reminder to refactor buckets