Refactoring and adding topics for user models