Observers

Change-Id: Iaa2aebf051a777bcdd8270a95354160b31823b0a
Add more features to observers

Change-Id: Ib712a74239c15c81344475411f776df66cf61ab4