as suprriya requested.

Shall we add another model for locations?