Added RecordNumber field and data management for it