adjusted schema