Support for records almost working