Add source info to all message types