Changed the return type of the AssemblyWrapper
Update class constructors and defaults