Added AppDomain changes