Standardize the use of current_adapter?