All services and targets now have to inherit from either Service or Target.