Better handlers and more blocks.