Add makeForm