Updated to use extract dependency