Moved blocker in lib/