Quote and data load refactoring.