Update form to 2.1 requirements