Added the basic context wrapper