Added AdaptationLogicFactory and BaseUrlResolver