Updated to better handle loading of form_types