[TASK] Improve CVL

Change-Id: I3fb517aaed79ca9454127358c7890f3ad1907741
Reviewed-on: https://review.typo3.org/26558
Reviewed-by: Georg Ringer
Tested-by: Georg Ringer