Add explicit class checks to single holder containers