Added support for dynamic records