Macros for QM added