Added support for NYC and standardized location conventions