Upgrades for 1.11.x
Optimizations
ads the userlist param