added handling for context path.