Support better monitoring