added more classes
added more properties