added Service Provider setup