Pack-scan changes

@property?