Context API updates