ST: Updated adapter handling for better internal usage
ST: Updated adapter handling for better internal usage