Revert to using records