Classes and forms changes

New Classes and forms changes