Refactoring collision handling