Added baseUrl support