Added location and activity table