Return trajectory object instead of named tuple