adding context-path support