Add new trajectory storage

Trying to merge the new trajectory storage to make master up-to-date.