AI-499 : keep type data in record