Adding support for max queue size and message expiry