GSIP-86 - some refactoring of monitor extension and moving to extension