Added PREFERENCES support