Adapt to demo env