Enhanced time and source tracking