Added hi/lo defs + u64/s64 types