Changed Longs to BigInt