Add cross-ref. Closes #358