Improved default user model