Added location as custom data to events

More code pushes