Bringing back the baseUrl as suggested in #191