Added user collection
Merge remote-tracking branch 'origin/redesignV2' into redesignV2