Added support for long-int64