- Replaced static associated object keys with the property selector