Switched back to old quartz builder pattern