enhanced package2.xml