Storage with new Core fixed