Add source code sender.
Various changes