Improved BlockDataContainer performance