New blocks highlighting
Adjustment towards new interfaces