Add repoze and VHM handling