More support for different sources