Adding timing capability