Added Typecheck on Forms