Work on the refectored Record component