Various improvements on Record