Updated Sync Source to work with components