Add in ObjectHolder to items & blocks