Added support for monitoring