serrano: Update and sync with new extract script