added locations and properties