Added classes 2