Extracted FOR-AS-HASH to a separate component.
Extracted FOR-AS-PACKAGE to a separate component.