Added more features for timings