Tweak struct def