Added a few more conditions for creating Form fields