Better predicate logic for entity type affinity rules
Less coupling between locations and their owning entities and more with the node placement strategy
Configuration keys for affinity on locations