Data Storage refactorization