Refactored CloudMadeProvider