Adding fields to endpoint to avoid mistaken re-ordering