Added check on values for a service provider