Refactoring.
Proposal of Storage class.