Are there ways to restrain non-covalent interactions between molecules in adjacent asymmetric units?

I know the custom bond procedure works well for covalent bonds. However I also would like to add restraints for (1) bond angles, (2) torsion angles (less important) and (3) nucleotide base-pairing. I know that all of these can be generated via the custom bond syntax, but that is a rather tedious and time-consuming process.  Perhaps there is a simpler way

I know this issue has been raised before but am unaware of any new developments.

Cheers

Jens
--