Code tidy
Handle additional attributes when building a data form
0.32.0