Added checks for the subscription term