Added monitoring
Fixed monitoring