Additional userdata refactoring