Support more source types
PLAT-587 #time 10m