Initial changes for using quartz