Upgraded Api.Wrapper