Adds support for Records