Added classes templates