Added all the remaining classes