Added separate handling for forms.