Added more monityoring.