Refactoring: introduced static final string attributes for storage keys.