Replace on-fit single holder container methods with descriptor objects