Add Multiple source support