API loading speed issue fixed