Added classes for each of the objects