Added support for old API