Add json type support to retreive more informations
Did I really commited this ?