Added oreferences observer.
Added some comments