Changes for standalone guvnor and guvnor management