Reverted Toolkit changes
Add missing bigint [#21]