Improved scheme database