Update for extract function