Refactored a bit
Minor
Validated variable injection
Minor
Upgraded minor version
Minor
Minor