Form:  Update classes constructors