Added back Adapter import, lost in merge. Fixed new ROL_set reference.