More work on package extraction