FEAT: Add support for mixed CS/VB solutions