Bring-up SPN's from @AICP