Minor refactoring, more update-related examples