Simplified the context listener management