Added ObjectHolder to the block and item init classes