Timing framework improvement

@nkogteva please, review.
Yeah! This was developed before I read wiki carefuly. I will fix that!