update to use api v2 structure