Time module related improvements

Follow