Rework copypasta in holder class