Updated sync to include settings