More monitoring changes and optimizations