Greatly simplify block storage and dispatch