Adding support for any context path