Refactored property dictionary.