Adds Support for Records

I believe this should add support for Records