Change: Improve monitor functionality.