Added support to time track