Add exception for vergil systems