added support for monitoring