Added ClassTypes
Added more Defaults and a Licence Option