Improvements to form classes and plugins