Refactoring + notifications