Redo api provider config to be more unified