Refactoring updates for user machinery