Added a context wrapper class for reusability