Added 32/64 bits timestamp switcher support