Adding support for context paths.