Added baseUrl variable