Some updates for extracting utils