New parameters added: source_root

Refactored old-styled variables