Re-arranged API fields