[TESB-13771] - Allow specify custom class as argument