Issue #224: Lowering memory footprint