Blocks and items are now using Null Object model