Modified core to not use storage