Finish bucket property refactor