Added a switch to load only commercial components via DFP
Refactor and comment