Changed ShapeManagerObserver to ShapeObserver