Updates to Observer class