Refactor, so it is compatible with KYPO CRP version 21.04