Adapt to latest Spring shell