Moved FormItem logic to FormItemFactory