Improved schema