Add support for few more locations