- added a self-reference for origin and destination