Added structure in making dynamic form