Improved schema info