Added embedded forms to form generation