Adding bucket_size and memory target options