Updated ui_schema and added identifiers in data_schema