Added more observers