src/structures: modify to make more friendly for the JSON api