Updated context intialization