updates for Trail refactoring in diagrams-lib
now need to explicitly import &