Updated to match PMA+ updates