Changed how the context is implemented