Changes to form classes