Use record matching
Update Date protocol related names