Observer improvements