Some refactoring for separated users lists