Adding padding and source ordering options.