Updated wrapper to 64-bit