New enrichments
Added BlockUtil and refactored other code to use it.