[APS] Rewrite for the new site design. Add support for supplemental