Start refactoring to use records