Wups, forgot to add back the other classes