Added favorites and preferences support