FORM Class Enhancments