Added the makeForm methods back in and added @deprecated