Add free form and fix a migration