Added dual storage