Added LocationSystem