Refactor to use form's save method