Updated returned structure for consistency with other APIs