Changes for preferences support.