Add other classes