Added general classes