Resolving TODO's
* Code comments
* AssemblyProviders transactions enabled