updated forms for new 2.7 schema