Added 32bit & 64bit int support