Added per-block configuration too