Added classes needed