Added

More defined classes