Add uint64 support to v2

@niemeyer ready for re-merge