Added controllers and observers