Fix bugs
Add Quartz