Refactor, change BindableBase to NotifyingClass