Fix context field position in API definition