Add localStroage support