Added support for uint64_t and int64_t