Add Form class for backward compatability