Add more info into API