Working on bucket property refactor