Renamed and cleaned up ServiceProvider