Added support for observers