Added Storage class.