Adding support to extra_block