Updated for new layouts and record structure