Improve record model