Separate 32/64 bit

Add 64bit support