Added support for other records