Add ok trajectory support