Added base path support.