Changed main wrapper class in default