Bug fix and support for transactional setupQueue