An apparatus for delivering pressurized, humidified breathable gas to a patient having a sleep-related disorder includes a CPAP unit with a blower configured to generate a flow of pressurized breathable gas. The Apparatus also includes a liquid storage container configured to hold a body of liquid. The liquid storage container has a gas feed opening, a gas discharge opening and a humidifying region above a metallic heat conducting material. In addition, the apparatus includes a support housing integrated directly into the CPAP unit and having a receiving space configured to removably receive the liquid storage container. The liquid storage container is structured such that when the liquid storage container is received by the support housing, the gas feed opening aligns with and engages with an ending portion of a gas feed flow path defined by the support structure and the gas discharge opening aligns with and engages with a beginning portion of a gas discharge flow path defined by the support structure so that the liquid storage container fluidly connects the gas feed flow path and the gas discharge flow path.