Refactored dictionaries