Merged extraction and hydration strategies to just strategies