Started adding support for 64-bit plugins