Added support for old signature