added text and number fields. Refactoring for schema json