added more general classes