Add missing usage of additionalFields in form classes