Add Service and Identity Provider abstraction