Location Enum updated,  it's mapping also