Moved Bucketizer from Collections to Dispatch and added value-mapping variant