Changed how admin and source collecting is handled