Adding void support