Refactoring. Added Quartz upgrade.