A gas generator assembly, which is especially suited to both transportable and on-board oxygen generators, with at least one adsorbent and a buffer tank to store product gas separated from a feed gas mixture. In order to make the assembly squat and compact, the buffer tank may be of an annular or quadruple U shaped configuration. Such a buffer tank configuration may also provide the assembly with improved structural and protective attributes.