Better block support