Add macros for default and transfer queues