Fix record simplification/cascading
Add more record handling code