Introduced additional types, fixed field descriptor