Adding trajectory support