Broke up nested classes in BindableBase