Improved schema shortcuts.