[#688] Adds a few more generic blocks to header