Complete API package adjustment