Enhance DI, add BigInt and Int guessers