Fixed form, updated schema to include version