Reworked RecordData and many other files