Replaced custom Observer/Subject with java built-in Observer/Observable