Added localStorage capability