Added support for multiple sources