Added form handling
Added missing migration