Some updates done for extracting utils