Added RecordSelector