Added classes for saving