Improve the Record management