Updated APIcaller