Added Storage class