add message source support