Global API call perfomance improvements