Add termination checking to records