Improved block support.