Fix 1: abstract and rename offset type