Added base URL support