Added some AMQ functional in modules