Re-structured API query