Added support for multiple context paths