Added classes (draft)