added enable/disable block support