Declarative version of the form

Change-Id: Ic39e29a0537489ef51f66612c2f47b1edff7d162