Added update controller & observer