Improvements to CLR structure. Works with several different standard libraries.