Enhance support for terms expire