Added full support for observers.