Add u4 and u2 types; use Field,Method struct