Switched edit form to the new type api