Add aux awareness