BlockStorage now returns Air instead of null for no block