Fixed broken core data storage optimization