Minor userData publication refactoring