Added structure for APIv3