Refactored end-users, distributors and users