Fix Namespacing
Add user model