CLSN-1741 : move bucket to uint, created enum