As you say, this is a natural fit for service contract based service packages. Definitely the thing to do.