Added more empty classes