improved schema