upd: base-schema
code review