Added location decoding