upgrading to 0.9.7 and some refactoring for BindingSpec