Added other classes