Added additional form functionality