Strong refactoring of Storage Class