Handle self service capability better.