Update and improve the api faker