For syn sync setting to add options support. Some minor changes