Add preference storage; Add session storage;