Improve Storage class