Added record type fields again