ServiceProvider, Relations fix, Gateway Api DB