Timing framework improvement

@nkogteva please, review.