Improved wrapper infrastructure