Updated the context module