I would add this code when initializing the context

I would add this code when initializing the context