Improved svim wrapper.