Added Storage classes