Added storage resolver