Added location and timestmap