Adding rule based location resolver