Added classes for some objects