#488 Refactored analysis field in apiv2