Implement context wrapper
Update example files to new format
Update submodule