Trajectory: add more variables for deep copy and assignment