Work on refactoring of PopUser