Added equals method in some classes