bundle update
Reduce complexity of user_attributes()