Added Storage and Entity Classes