Improved VoID support.