Added Unified API support