Added preference check