Added classes and objects