Added storage query code.