Deduder and bucket functionality with code review changes