Make analytics location protocol independent (#30)