[#334] Added locations