Document and add macros for additional DSA options