Fifth part of simplification refactoring and introduction of the notion of user ID