Generic update for #378
Verify new cases
Fix pair programming issue with wine bottle
Remove unused supplier
Add static Environment helper and reference holder
Refactor GS Collections usages.