Updated wrapper logic.