Better PREFIX support