Refactor the blockers