Added loads of classes for storage stuff