Added Observer/Observable classes