Working on support of int64