Move extraction layers to adapter