Add detection for PA and Carbon