Add VOid closeure
Enhance modelwraper to prevent from ctaching