Updated Sync tool to work with Settings entity