Add option to make blocks not mandatory