Improvements to Adaptor API
Added javadocs