Location module modifications