Added uid check for user APIs
Refactored user build methods
Merge remote-tracking branch 'origin/user' into package