More work on user models