Add bucket property and test on option