Background refactoring