Added several classes and enums :)