Changed instantiation
Added more classes, convenience conversion, changed instantiation and finalization