Split up Primitives and Numerics
Add BigInteger support