Fixed mapping error
[DRAFT] Timing probes