added several classes