add context path support