Improve monitoring