Adding time tracking feature