add dual storage support