core: update based on demo storage