Some amendments in MQ and Timeout