Updated wrapper definition