Added support for Unified API