package file parsing improvements