Updated to 64 bit Unified API