Add fullstate trajectory support