improved schema config