Use new API for handling special blocks