added checks for other classes