Add support for record and fun