Update for 64 bit architecture