Added index on package_id