Blocker refactoring