Refactoring UserBundle