Data blocks now stored in containers to allow validity to be checked.