added ClassWrapper, Initialization methods and other stuff