Including package data with refactoring