Added support for int64_t and uint64_t