Add support for conditional block option