Added htmlform and underlying metadata