Made locations backwards-compatibile