Include option to return a data frame with trajectory info