Added some component factory and intial Form components