Refactoring the data storeage keys access...