Improve record wrapper