added config flag to enable message queue