reworked schemas