Add prefix preference support