Changed to export mappings for multiple providers