Added local storage type management;