refactored internal storage
refactor storage done
Updated cookie save mechanism