Added timestamp and source field