Refactor remaining records with attributes array