Improvements to AdapterFactory - no longer dependent on container