Added double form type support