Added new clasess