Change dictionary, use int64 everywhere.