Add single pass location upload support