Changed the way the Assemblys are loaded