update> model and filter refactoring