Refactored to isolate token generator in another package. Some storage implementation