Use forms create/update generators, move execute to invocations