Added support for some legacy code