Added support of local storage