New location rule for ACF
Minor refactoring