updated classes to remove observables