Separating plugin value into two alternate variables.

Adding more swaps in the boilerplate file.